Merge tag 'upstream/2.1.0'
authorGraham Inggs <ginggs@debian.org>
Fri, 7 Jul 2017 15:18:15 +0000 (17:18 +0200)
committerGraham Inggs <ginggs@debian.org>
Fri, 7 Jul 2017 15:18:15 +0000 (17:18 +0200)
commitcd065fbe050d812008488c540f99516d06b6bd4c
treeb52686f0d015c81ed284e188bb3bb396ace3d318
parent65ac199c71dd593d43760f2249530c8f19af38b6
parent6f1c1b60552164b40a7b7079f523846a244597f6
Merge tag 'upstream/2.1.0'

Upstream version 2.1.0